From f11a11ff7b1a747d2c4ec8a8be217eb93b68214f Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Fri, 27 Jul 2007 09:06:58 +0100 Subject: [PATCH] Implement Xen API method Console.set_other_config. Signed-off-by: Jim Fehlig --- tools/python/xen/xend/XendAPI.py | 7 +++++++ tools/python/xen/xend/XendConfig.py | 16 +++++++++++++--- tools/python/xen/xend/XendDomainInfo.py | 3 +++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/tools/python/xen/xend/XendAPI.py b/tools/python/xen/xend/XendAPI.py index ff48d73976..00bc9fdec5 100644 --- a/tools/python/xen/xend/XendAPI.py +++ b/tools/python/xen/xend/XendAPI.py @@ -2438,6 +2438,13 @@ class XendAPI(object): except XendError, exn: return xen_api_error(['INTERNAL_ERROR', str(exn)]) + def console_set_other_config(self, session, console_ref, other_config): + xd = XendDomain.instance() + vm = xd.get_vm_with_dev_uuid('console', console_ref) + vm.set_console_other_config(console_ref, other_config) + xd.managed_config_save(vm) + return xen_api_success_void() + # Xen API: Class SR # ---------------------------------------------------------------- SR_attr_ro = ['VDIs', diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index 5bc40a5dfb..ccc57dade9 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -129,6 +129,11 @@ XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'boot', 'device_model', 'display', 'vncconsole', 'vncdisplay', 'vnclisten', 'vncpasswd', 'vncunused', 'xauthority'] +# Xen API console 'other_config' keys. +XENAPI_CONSOLE_OTHER_CFG = ['vncunused', 'vncdisplay', 'vnclisten', + 'vncpasswd', 'type', 'display', 'xauthority', + 'keymap'] + # List of XendConfig configuration keys that have no direct equivalent # in the old world. @@ -1121,9 +1126,7 @@ class XendConfig(dict): # with vfb other_config = {} - for key in ['vncunused', 'vncdisplay', 'vnclisten', - 'vncpasswd', 'type', 'display', 'xauthority', - 'keymap']: + for key in XENAPI_CONSOLE_OTHER_CFG: if key in dev_info: other_config[key] = dev_info[key] target['devices'][dev_uuid][1]['other_config'] = other_config @@ -1311,6 +1314,13 @@ class XendConfig(dict): for dev_uuid, (dev_type, dev_info) in self['devices'].items(): if dev_uuid == console_uuid: dev_info[key] = value + # collapse other_config into dev_info for things + # such as vncpasswd, vncunused, etc. + if key == 'other_config': + for k in XENAPI_CONSOLE_OTHER_CFG: + if k in dev_info and k not in value: + del dev_info[k] + dev_info.update(value) break def console_get_all(self, protocol): diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 0fe545aa31..9d57d15b33 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -2633,6 +2633,9 @@ class XendDomainInfo: return dev_uuid + def set_console_other_config(self, console_uuid, other_config): + self.info.console_update(console_uuid, 'other_config', other_config) + def destroy_device_by_uuid(self, dev_type, dev_uuid): if dev_uuid not in self.info['devices']: raise XendError('Device does not exist') -- 2.30.2